Huis Verkennen Help
Registreer Inloggen
Kodo
/
kodo
Volgen 2
Ster 0
Vork 0

Bladeren bron
fix coercing to Unicode: need string or buffer, long found

FFIB 4 jaren geleden
bovenliggende
2bc4852812
commit
88b564d033
13 gewijzigde bestanden met toevoegingen van 58 en 58 verwijderingen
Toon Diff Stats
  1. 8 8
      account/models.py
  2. 2 2
      coupon/models.py
  3. 5 5
      group/models.py
  4. 1 1
      guideline/models.py
  5. 2 2
      integral/models.py
  6. 4 4
      logs/models.py
  7. 1 1
      marketcode/models.py
  8. 11 11
      mch/models.py
  9. 6 6
      member/models.py
  10. 4 4
      message/models.py
  11. 2 2
      sales/models.py
  12. 1 1
      staff/models.py
  13. 11 11
      statistic/models.py

+ 8 - 8
account/models.py
Bestand weergeven 

@@ -71,7 +71,7 @@ class LensmanInfo(BaseModelMixin, LensmanTypeBoolMixin):
71 71 
         verbose_name_plural = _(u'lensmaninfo')
72 72
73 73 
     def __unicode__(self):
74 
-        return self.pk
74 
+        return '%d' % self.pk
75 75
76 76 
     def final_status(self, lensman_type):
77 77 
         if lensman_type == self.COMMON:  # 普通摄影师校验
 
@@ -118,7 +118,7 @@ class LensmanLoginLogInfo(BaseModelMixin):
118 118 
         verbose_name_plural = _(u'lensmanloginloginfo')
119 119
120 120 
     def __unicode__(self):
121 
-        return self.pk
121 
+        return '%d' % self.pk
122 122
123 123
124 124 
 class LensmanIncomeExpensesInfo(BaseModelMixin):
 
@@ -150,7 +150,7 @@ class LensmanIncomeExpensesInfo(BaseModelMixin):
150 150 
         verbose_name_plural = _(u'lensmanincomeexpensesinfo')
151 151
152 152 
     def __unicode__(self):
153 
-        return self.pk
153 
+        return '%d' % self.pk
154 154
155 155
156 156 
 class TourGuideInfo(BaseModelMixin):
 
@@ -197,7 +197,7 @@ class TourGuideInfo(BaseModelMixin):
197 197 
         verbose_name_plural = _(u'tourguideinfo')
198 198
199 199 
     def __unicode__(self):
200 
-        return self.pk
200 
+        return '%d' % self.pk
201 201
202 202 
     @property
203 203 
     def photo_url(self):
 
@@ -245,7 +245,7 @@ class WechatInfo(BaseModelMixin):
245 245 
         verbose_name_plural = _(u'wechatinfo')
246 246
247 247 
     def __unicode__(self):
248 
-        return self.pk
248 
+        return '%d' % self.pk
249 249
250 250
251 251 
 class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):
 
@@ -389,7 +389,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):
389 389 
         )
390 390
391 391 
     def __unicode__(self):
392 
-        return self.pk
392 
+        return '%d' % self.pk
393 393
394 394 
     @property
395 395 
     def final_integral(self):
 
@@ -580,7 +580,7 @@ class UserLoginLogInfo(BaseModelMixin):
580 580 
         verbose_name_plural = _(u'userloginloginfo')
581 581
582 582 
     def __unicode__(self):
583 
-        return self.pk
583 
+        return '%d' % self.pk
584 584
585 585
586 586 
 class UserIncomeExpensesInfo(BaseModelMixin):
 
@@ -612,4 +612,4 @@ class UserIncomeExpensesInfo(BaseModelMixin):
612 612 
         verbose_name_plural = _(u'userincomeexpensesinfo')
613 613
614 614 
     def __unicode__(self):
615 
-        return self.pk
615 
+        return '%d' % self.pk

+ 2 - 2
coupon/models.py
Bestand weergeven 

@@ -41,7 +41,7 @@ class CouponInfo(BaseModelMixin):
41 41 
         verbose_name_plural = _(u'券信息')
42 42
43 43 
     def __unicode__(self):
44 
-        return self.pk
44 
+        return '%d' % self.pk
45 45
46 46 
     @property
47 47 
     def coupon_image_path(self):
 
@@ -98,7 +98,7 @@ class UserCouponInfo(BaseModelMixin):
98 98 
         verbose_name_plural = _(u'用户券信息')
99 99
100 100 
     def __unicode__(self):
101 
-        return self.pk
101 
+        return '%d' % self.pk
102 102
103 103 
     @property
104 104 
     def coupon_image_path(self):

+ 5 - 5
group/models.py
Bestand weergeven 

@@ -181,7 +181,7 @@ class GroupUserInfo(BaseModelMixin):
181 181 
         )
182 182
183 183 
     def __unicode__(self):
184 
-        return self.pk
184 
+        return '%d' % self.pk
185 185
186 186 
     @property
187 187 
     def user_info(self):
 
@@ -269,7 +269,7 @@ class GroupPhotoInfo(BaseModelMixin, LensmanTypeMixin):
269 269 
         )
270 270
271 271 
     def __unicode__(self):
272 
-        return self.pk
272 
+        return '%d' % self.pk
273 273
274 274 
     @property
275 275 
     def photo_url(self):
 
@@ -356,7 +356,7 @@ class GroupPhotoOrderInfo(BaseModelMixin):
356 356 
         )
357 357
358 358 
     def __unicode__(self):
359 
-        return self.pk
359 
+        return '%d' % self.pk
360 360
361 361 
     @property
362 362 
     def m_photo_url(self):
 
@@ -392,7 +392,7 @@ class PhotoCommentInfo(BaseModelMixin):
392 392 
         verbose_name_plural = _(u'photocommentinfo')
393 393
394 394 
     def __unicode__(self):
395 
-        return self.pk
395 
+        return '%d' % self.pk
396 396
397 397 
     @property
398 398 
     def comment_info(self):
 
@@ -422,7 +422,7 @@ class PhotoThumbUpInfo(BaseModelMixin):
422 422 
         )
423 423
424 424 
     def __unicode__(self):
425 
-        return self.pk
425 
+        return '%d' % self.pk
426 426
427 427 
     @property
428 428 
     def thumbup_info(self):

+ 1 - 1
guideline/models.py
Bestand weergeven 

@@ -46,7 +46,7 @@ class ScreenAdminInfo(BaseModelMixin):
46 46 
         )
47 47
48 48 
     def __unicode__(self):
49 
-        return self.pk
49 
+        return '%d' % self.pk
50 50
51 51 
     @property
52 52 
     def data(self):

+ 2 - 2
integral/models.py
Bestand weergeven 

@@ -55,7 +55,7 @@ class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin):
55 55 
         verbose_name_plural = _(u'saleclerkintegralincomeexpensesinfo')
56 56
57 57 
     def __unicode__(self):
58 
-        return self.pk
58 
+        return '%d' % self.pk
59 59
60 60 
     @property
61 61 
     def model_info(self):
 
@@ -128,7 +128,7 @@ class SaleclerkSubmitLogInfo(BaseModelMixin):
128 128 
         verbose_name_plural = _(u'销售员扫码出库记录')
129 129
130 130 
     def __unicode__(self):
131 
-        return self.pk
131 
+        return '%d' % self.pk
132 132
133 133 
     @property
134 134 
     def image_path(self):

+ 4 - 4
logs/models.py
Bestand weergeven 

@@ -36,7 +36,7 @@ class MchInfoEncryptLogInfo(BaseModelMixin):
36 36 
         verbose_name_plural = _(u'mchinfoencryptloginfo')
37 37
38 38 
     def __unicode__(self):
39 
-        return self.pk
39 
+        return '%d' % self.pk
40 40
41 41 
     @property
42 42 
     def admindata(self):
 
@@ -77,7 +77,7 @@ class MchInfoDecryptLogInfo(BaseModelMixin):
77 77 
         verbose_name_plural = _(u'mchinfodecryptloginfo')
78 78
79 79 
     def __unicode__(self):
80 
-        return self.pk
80 
+        return '%d' % self.pk
81 81
82 82
83 83 
 class MchLogInfo(BaseModelMixin):
 
@@ -93,7 +93,7 @@ class MchLogInfo(BaseModelMixin):
93 93 
         verbose_name_plural = _(u'mchloginfo')
94 94
95 95 
     def __unicode__(self):
96 
-        return self.pk
96 
+        return '%d' % self.pk
97 97
98 98
99 99 
 class MchSearchModelAndCameraLogInfo(BaseModelMixin):
 
@@ -112,4 +112,4 @@ class MchSearchModelAndCameraLogInfo(BaseModelMixin):
112 112 
         verbose_name_plural = _(u'mchsearchmodelandcameraloginfo')
113 113
114 114 
     def __unicode__(self):
115 
-        return self.pk
115 
+        return '%d' % self.pk

+ 1 - 1
marketcode/models.py
Bestand weergeven 

@@ -21,4 +21,4 @@ class MarketCodeInfo(BaseModelMixin):
21 21 
         verbose_name_plural = _(u'一物一码信息')
22 22
23 23 
     def __unicode__(self):
24 
-        return self.pk
24 
+        return '%d' % self.pk

+ 11 - 11
mch/models.py
Bestand weergeven 

@@ -117,7 +117,7 @@ class BrandInfo(BaseModelMixin):
117 117 
         verbose_name_plural = _(u'品牌信息')
118 118
119 119 
     def __unicode__(self):
120 
-        return self.pk
120 
+        return '%d' % self.pk
121 121
122 122 
     @property
123 123 
     def brand_logo_url(self):
 
@@ -173,7 +173,7 @@ class ModelInfo(BaseModelMixin):
173 173 
         verbose_name_plural = _(u'型号信息')
174 174
175 175 
     def __unicode__(self):
176 
-        return self.pk
176 
+        return '%d' % self.pk
177 177
178 178 
     @property
179 179 
     def image_path(self):
 
@@ -271,7 +271,7 @@ class ModelImageInfo(BaseModelMixin):
271 271 
         verbose_name_plural = _(u'型号图片信息')
272 272
273 273 
     def __unicode__(self):
274 
-        return self.pk
274 
+        return '%d' % self.pk
275 275
276 276 
     @property
277 277 
     def image_url(self):
 
@@ -299,7 +299,7 @@ class CameraModelInfo(BaseModelMixin):
299 299 
         verbose_name_plural = _(u'机身信息')
300 300
301 301 
     def __unicode__(self):
302 
-        return self.pk
302 
+        return '%d' % self.pk
303 303
304 304
305 305 
 class ModelCameraBodyInfo(BaseModelMixin):
 
@@ -323,7 +323,7 @@ class ModelCameraBodyInfo(BaseModelMixin):
323 323 
         verbose_name_plural = _(u'型号机身适配信息')
324 324
325 325 
     def __unicode__(self):
326 
-        return self.pk
326 
+        return '%d' % self.pk
327 327
328 328 
     @property
329 329 
     def model_url(self):
 
@@ -376,7 +376,7 @@ class DistributorInfo(BaseModelMixin):
376 376 
         verbose_name_plural = _(u'经销商信息')
377 377
378 378 
     def __unicode__(self):
379 
-        return self.pk
379 
+        return '%d' % self.pk
380 380
381 381 
     @property
382 382 
     def data(self):
 
@@ -456,7 +456,7 @@ class SaleclerkInfo(BaseModelMixin, SexModelMixin):
456 456 
         )
457 457
458 458 
     def __unicode__(self):
459 
-        return self.pk
459 
+        return '%d' % self.pk
460 460
461 461 
     @property
462 462 
     def admindata(self):
 
@@ -500,7 +500,7 @@ class MaintenancemanInfo(BaseModelMixin, SexModelMixin):
500 500 
         )
501 501
502 502 
     def __unicode__(self):
503 
-        return self.pk
503 
+        return '%d' % self.pk
504 504
505 505 
     @property
506 506 
     def data(self):
 
@@ -535,7 +535,7 @@ class BrandModelDistributorPriceInfo(BaseModelMixin):
535 535 
         )
536 536
537 537 
     def __unicode__(self):
538 
-        return self.pk
538 
+        return '%d' % self.pk
539 539
540 540
541 541 
 class LatestAppInfo(BaseModelMixin):
 
@@ -668,7 +668,7 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin):
668 668 
         verbose_name_plural = _(u'消费者信息提交记录')
669 669
670 670 
     def __unicode__(self):
671 
-        return self.pk
671 
+        return '%d' % self.pk
672 672
673 673 
     @property
674 674 
     def model_info(self):
 
@@ -776,7 +776,7 @@ class ActivityInfo(BaseModelMixin):
776 776 
         verbose_name_plural = _(u'活动信息')
777 777
778 778 
     def __unicode__(self):
779 
-        return self.pk
779 
+        return '%d' % self.pk
780 780
781 781 
     def final_expire_at(self, created_at=None):
782 782 
         if self.coupon_expire_type == ActivityInfo.FIXED_EXPIRED_TIME:

+ 6 - 6
member/models.py
Bestand weergeven 

@@ -51,7 +51,7 @@ class GoodsInfo(BaseModelMixin):
51 51 
         verbose_name_plural = _(u'会员商品信息')
52 52
53 53 
     def __unicode__(self):
54 
-        return self.pk
54 
+        return '%d' % self.pk
55 55
56 56 
     @property
57 57 
     def image_path(self):
 
@@ -134,7 +134,7 @@ class GoodsOrderInfo(BaseModelMixin):
134 134 
         verbose_name_plural = _(u'会员商品订单信息')
135 135
136 136 
     def __unicode__(self):
137 
-        return self.pk
137 
+        return '%d' % self.pk
138 138
139 139 
     @property
140 140 
     def admindata(self):
 
@@ -205,7 +205,7 @@ class RightInfo(BaseModelMixin):
205 205 
         verbose_name_plural = _(u'会员权益信息')
206 206
207 207 
     def __unicode__(self):
208 
-        return self.pk
208 
+        return '%d' % self.pk
209 209
210 210 
     @property
211 211 
     def icon_path(self):
 
@@ -265,7 +265,7 @@ class ShotTypeInfo(BaseModelMixin):
265 265 
         verbose_name_plural = _(u'镜头类型信息')
266 266
267 267 
     def __unicode__(self):
268 
-        return self.pk
268 
+        return '%d' % self.pk
269 269
270 270 
     @property
271 271 
     def shots(self):
 
@@ -492,7 +492,7 @@ class MemberActivitySignupInfo(BaseModelMixin):
492 492 
         )
493 493
494 494 
     def __unicode__(self):
495 
-        return self.pk
495 
+        return '%d' % self.pk
496 496
497 497
498 498 
 class MemberActivitySigninInfo(BaseModelMixin):
 
@@ -516,7 +516,7 @@ class MemberActivitySigninInfo(BaseModelMixin):
516 516 
         )
517 517
518 518 
     def __unicode__(self):
519 
-        return self.pk
519 
+        return '%d' % self.pk
520 520
521 521
522 522 
 class MemberActivityGroupShareInfo(BaseModelMixin):

+ 4 - 4
message/models.py
Bestand weergeven 

@@ -57,7 +57,7 @@ class UserMessageInfo(BaseModelMixin):
57 57 
         verbose_name_plural = _('usermessageinfo')
58 58
59 59 
     def __unicode__(self):
60 
-        return self.pk
60 
+        return '%d' % self.pk
61 61
62 62 
     def msg_info(self, user_id=None):
63 63 
         try:
 
@@ -89,7 +89,7 @@ class SystemMessageInfo(BaseModelMixin, PaiaiSrcMixin):
89 89 
         verbose_name_plural = _('systemmessageinfo')
90 90
91 91 
     def __unicode__(self):
92 
-        return self.pk
92 
+        return '%d' % self.pk
93 93
94 94 
     def msg_info(self, user_id=None):
95 95 
         return {
 
@@ -114,7 +114,7 @@ class SystemMessageReadInfo(BaseModelMixin):
114 114 
         )
115 115
116 116 
     def __unicode__(self):
117 
-        return self.pk
117 
+        return '%d' % self.pk
118 118
119 119
120 120 
 class SystemMessageDeleteInfo(BaseModelMixin):
 
@@ -130,4 +130,4 @@ class SystemMessageDeleteInfo(BaseModelMixin):
130 130 
         )
131 131
132 132 
     def __unicode__(self):
133 
-        return self.pk
133 
+        return '%d' % self.pk

+ 2 - 2
sales/models.py
Bestand weergeven 

@@ -107,7 +107,7 @@ class SalesResponsibilityInfoModelsSaleStatisticInfo(BaseModelMixin):
107 107 
         verbose_name_plural = _(u'[销售担当]型号销量统计')
108 108
109 109 
     def __unicode__(self):
110 
-        return self.pk
110 
+        return '%d' % self.pk
111 111
112 112 
     @property
113 113 
     def data(self):
 
@@ -144,7 +144,7 @@ class SuperSalesResponsibilityInfoModelsSaleStatisticInfo(BaseModelMixin):
144 144 
         verbose_name_plural = _(u'[超级销售担当]销售担当销量统计')
145 145
146 146 
     def __unicode__(self):
147 
-        return self.pk
147 
+        return '%d' % self.pk
148 148
149 149 
     @property
150 150 
     def data(self):

+ 1 - 1
staff/models.py
Bestand weergeven 

@@ -14,4 +14,4 @@ class StaffDeleteClerkSaleSubmitLogInfo(BaseModelMixin):
14 14 
         verbose_name_plural = _(u'staffdeleteclerksalesubmitloginfo')
15 15
16 16 
     def __unicode__(self):
17 
-        return self.pk
17 
+        return '%d' % self.pk

+ 11 - 11
statistic/models.py
Bestand weergeven 

@@ -19,7 +19,7 @@ class RegisterStatisticInfo(BaseModelMixin):
19 19 
         verbose_name_plural = _(u'注册用户统计')
20 20
21 21 
     def __unicode__(self):
22 
-        return self.pk
22 
+        return '%d' % self.pk
23 23
24 24 
     @property
25 25 
     def data(self):
 
@@ -42,7 +42,7 @@ class SaleStatisticInfo(BaseModelMixin):
42 42 
         verbose_name_plural = _(u'[经销商维度]销量统计')
43 43
44 44 
     def __unicode__(self):
45 
-        return self.pk
45 
+        return '%d' % self.pk
46 46
47 47 
     @property
48 48 
     def data(self):
 
@@ -65,7 +65,7 @@ class ModelSaleStatisticInfo(BaseModelMixin):
65 65 
         verbose_name_plural = _(u'[经销商维度]型号销量统计')
66 66
67 67 
     def __unicode__(self):
68 
-        return self.pk
68 
+        return '%d' % self.pk
69 69
70 70 
     @property
71 71 
     def data(self):
 
@@ -98,7 +98,7 @@ class DistributorSaleStatisticInfo(BaseModelMixin):
98 98 
         verbose_name_plural = _(u'[经销商维度]经销商销量统计')
99 99
100 100 
     def __unicode__(self):
101 
-        return self.pk
101 
+        return '%d' % self.pk
102 102
103 103 
     @property
104 104 
     def data(self):
 
@@ -124,7 +124,7 @@ class ProvinceSaleStatisticInfo(BaseModelMixin):
124 124 
         verbose_name_plural = _(u'[经销商维度]省份销量统计')
125 125
126 126 
     def __unicode__(self):
127 
-        return self.pk
127 
+        return '%d' % self.pk
128 128
129 129 
     @property
130 130 
     def data(self):
 
@@ -151,7 +151,7 @@ class SaleclerkSaleStatisticInfo(BaseModelMixin):
151 151 
         verbose_name_plural = _(u'[经销商维度]销售员销量统计')
152 152
153 153 
     def __unicode__(self):
154 
-        return self.pk
154 
+        return '%d' % self.pk
155 155
156 156 
     @property
157 157 
     def data(self):
 
@@ -178,7 +178,7 @@ class ConsumeUserStatisticInfo(BaseModelMixin):
178 178 
         verbose_name_plural = _(u'[消费者维度]用户统计')
179 179
180 180 
     def __unicode__(self):
181 
-        return self.pk
181 
+        return '%d' % self.pk
182 182
183 183 
     @property
184 184 
     def data(self):
 
@@ -198,7 +198,7 @@ class ConsumeSaleStatisticInfo(BaseModelMixin):
198 198 
         verbose_name_plural = _(u'[消费者维度]销量统计')
199 199
200 200 
     def __unicode__(self):
201 
-        return self.pk
201 
+        return '%d' % self.pk
202 202
203 203 
     @property
204 204 
     def data(self):
 
@@ -221,7 +221,7 @@ class ConsumeModelSaleStatisticInfo(BaseModelMixin):
221 221 
         verbose_name_plural = _(u'[消费者维度]型号销量统计')
222 222
223 223 
     def __unicode__(self):
224 
-        return self.pk
224 
+        return '%d' % self.pk
225 225
226 226 
     @property
227 227 
     def data(self):
 
@@ -245,7 +245,7 @@ class ConsumeDistributorSaleStatisticInfo(BaseModelMixin):
245 245 
         verbose_name_plural = _(u'[消费者维度]经销商销量统计')
246 246
247 247 
     def __unicode__(self):
248 
-        return self.pk
248 
+        return '%d' % self.pk
249 249
250 250 
     @property
251 251 
     def data(self):
 
@@ -273,7 +273,7 @@ class ConsumeProvinceSaleStatisticInfo(BaseModelMixin):
273 273 
         verbose_name_plural = _(u'[消费者维度]省份销量统计')
274 274
275 275 
     def __unicode__(self):
276 
-        return self.pk
276 
+        return '%d' % self.pk
277 277
278 278 
     @property
279 279 
     def data(self):